Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 20 Nov 2011 05:38:43 +0000 (21:38 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 20 Nov 2011 05:38:43 +0000 (21:38 -0800)
commitbb83a9e5859490f81243309e4a2475b0b19d03c9
tree47f3f98146f45d40931748c1f76e948d646f82a4
parentc0b2e55fe85a22a7c0fb0822364289570c0292a7
parent34056c0f6216dcd4d5774a56e26680038b035783
Merge from trunk.